Scout changes

Trying out a fix from nick findings