More tweaks to how levels are handled