Mac and Windows connection fix