Change non portable logical operators into portable logical operators