ProjectHelpers: Fixes #1429.
Code: Cleanup and analysis fixes.
Merge pull request #1436 from am11/master

ProjectHelpers: Fixes #1429