Fix boolean operators, reverted type