MBH: bug fixes