Fix potential unary operators errors