Fixed a couple compile time issues.
Merge branch 'master' of https://github.com/mitchellgordon95/POSA-14 into completed