fixes for the build speedup