Tweaks to Host class