Merge "Fix binary operations"