Fixes for properly generating source files