GenMakefile fixes