Fixes for multi-ops: