Fix some keys