bug fixes
Merge branch 'base-build' of github.com:chazmead/Phire into base-build