Bug fixes for clean build
Merge branch 'master' of github.com:jamesbowman/gd2-book