Fixed problems with operators/comparisons