Use actual hostname

Fix merge conflicts from #45