Make the build work again with Razor V3

+some minor cleanup