fix some key handling