Fix violations of parametricity