Manual ops/delete* fixup