More fixes.
Merge branch 'master' of github.com:douglascraigschmidt/POSA-14