more fixes to keys