Fix hostname handling, remove extra config option