Even more bugs fixed
Merge branch 'ConsolidatedRelease' of https://github.com/home-port/HomePort into ConsolidatedRelease