Additional reworks

I broke the build. Pass the FEZ!