Fixes to get generated files to build.