Some Fixes for hotbuild