Fix some cases with binary operations.