Fixes to get it to work with new mce