More level fixes