Fix to some keys