Fix build issues.
Merge pull request #1 from rhinosaur665/buildfixes

Fix build issues.