Fixes to support newest Mandrake