Finalise new hoster changes
Merge branch 'hotfix-0.2'