Fix config override, add instance switch to CLI tools