[WFCORE-225] Update scripts for various issues found and general cleanup.
Merge pull request #374 from jamezp/WFCORE-225

[WFCORE-225] Update scripts for various issues found and general cleanup