[[ ScriptOnlyStack ]] Fix a couple of issues as the result of merge from 6.7.