Bug Fixes for the new build
Remove Comment
Merge pull request #1260 from DaviRyan/BugFixes

Bug fixes