Merge some mayhem changes