Minor fixes in gtm-close with regard to auto-connect