Removed a couple of potential bug sources in the new level