Fix build

Lets try this again, but actually wait and fix the build.