Fixes for HB-34, HB-27, HB-29, HB-33