more connect bug fixes