Further fixes precedence issues