Fix AND and OR.