one less local variable
Fix bug in deprecation of 'fields' setting
- fix kv specs