Fixes to allow proper compilation and no warnings in Makefile.