Fixes and tweaks to levels with issues