Updates to productionize bshtml