More restructuring fixes