And some more build fixes...
Merge pull request #25 from jstamp/build-fixes

And some more build fixes...