Build fixes
Merge pull request #278 from alxdarksage/develop

Build fixes