Fixing hostname problems