fixes for hb