Fixed build issues

Some errors were made when creating the Github repo. Project builds
successfully now.
Merge branch 'master' into dev-sjb