Fixed some infix operator issues