Couple of level fixes