Fixed some key definitions