Fix a few bugs
Merge branch 'HomePortRefactored' of https://github.com/home-port/HomePort into HomePortRefactored