Fix that/who mistakes