Fixed a few things as suggested by ottxor.

The only thing still missing is a better way to deal with the Makefile.

Package-Manager: portage-2.2.0_alpha174