add some missing key handling