Removed some key conflicts