Fix most of compilation issues.

Fix most of compilation issues.

I didn't want to make all the changes in a single commit so I split the
work. The project could not be built because of the partial changes
hence I didn't think about trying to make.
I've tried to build today and found many minor problems with the code
produced since commit 60f1edc (the copy to bonus).

I don't have much time and strength today but I wanted to be productive
so I've at least done this.