Fix issues with block cycling in Mayhem