Level fixes

Replaces #1696

This should merge this time.