Moved servername fix to apply to other platforms than windows