Fix value_for_key APIs