Fix hostname stuff