Merge pull request #346 from github/vulns-felipe

Address some longstanding issues in the script/workspace folder

Author: felipesu19