Scoping tweaks