scope - small fixes