Fixed generation for CustomBuild