Fixes for pending_op changes