Section fixes
Bugfixes for scoped stuff