Enable faster builds, fix the build