More fixes to keys