Fixing bshtml issues...