Fixes for new level format