Fix the build
Merge pull request #317 from peternewman/trivial-fixes

Fix the build