Fixed host operations
Merge pull request #520 from dswd/web-fixes

Fixed host operations