Fixed translation issue.
Fixed issue with PW vars in scope.