More improvements on the build