Fix uses of keys that want lists