Minor fixes of keys