fixes for hotbuild in new build