More fixes for check of keystone instance being defined