more nitpick hostname hacks