Unary ops handling
Minor adjustments