More fixes on keys