Update: Hostname now set more gracefully