speedup the build - fixes