More fixes for keys