Add fixes to warper and dungeon system