Minor fixes in MHIPS/MHBP code