Some final tweaks to the generator for secc sites