Fix some basic build errors
Merge pull request #1 from timlinux/develop

Fix some basic build errors