Continued restructuring fixes