Improvements for KVP validation.