More key fixes