Dungeon keys fixes, etc