hostname fixes

Addresses: https://bugzilla.novell.com/show_bug.cgi?id=886238