Misc fixes to Operation classes

Build upon #233, so need to merge that one first to be able to see the changes here more clearly.
For #231 and #192