Fixing the build, once and for all