Fix build issues

There may still be runtime ones though
Merge pull request #1 from benjojo/patch-1

Fix build issues