more hotbuild2 fixes for new build