Further optimization of the build