Fix up Mantle