Minor changes (mostly around selection of CMIS endpoint)