some fixes to compile errors
Merge branch 'master' of github.com:davewx7/Citadel