MBH: pushing Ben's warnings fix