More keyword fixing.