Small cleanups in source code and Makefiles