email + hostname fixes