A few small changes to get it working on my machine
Merge pull request #1 from ConCode/build-fixes

A few small changes to get it working on my machine