Fixed hostname issues