More bug fixes with MH