Core: key-value list handling fixes