Tweak files so generator works properly