Fix issues with Mayhem