More options scope fixes