Minor fix and making only operators with 1 term available for expectation