More tweaks for OSX connect commands