diff --git a/src/dynpmc/instrumentruncore.pmc b/src/dynpmc/instrumentruncore.pmc
index 3acbda9..6b456b8 100644
--- a/src/dynpmc/instrumentruncore.pmc
+++ b/src/dynpmc/instrumentruncore.pmc
@@ -311,7 +311,7 @@ runcore_probes_setup(PARROT_INTERP, PMC *runcore) {
     GETATTR_InstrumentRuncore_instrument(interp, runcore, instrument);
     GETATTR_Instrument_supervised(interp, instrument, supervised);
 
-    count    = supervised->code->op_count;
+    count    = Parrot_hash_size(interp, interp->op_hash);
     hooks    = mem_gc_allocate_n_zeroed_typed(interp, count, probe_list_t *);
     catchall = probe_list_create_list(interp);
 
diff --git a/src/runtime/Instrument/Probe.nqp b/src/runtime/Instrument/Probe.nqp
index e68f190..30a0caa 100644
--- a/src/runtime/Instrument/Probe.nqp
+++ b/src/runtime/Instrument/Probe.nqp
@@ -89,7 +89,7 @@ everytime a dynlib is loaded.
         }
         else {
             # $op is singular.
-            my %oplib := pir::new__PS('OpLib');
+            my %oplib := pir::new__PSP('OpLib', "core_ops");
 
             if pir::does__IPS($op, 'integer') {
                 # $op = op number.
diff --git a/t/instrument_probe.t b/t/instrument_probe.t
index 408dda8..70df575 100644
--- a/t/instrument_probe.t
+++ b/t/instrument_probe.t
@@ -89,7 +89,8 @@ PROG
 
 .sub test_core_op
     .local pmc probe, probe_class, oplib
-    oplib = new ['OpLib']
+    $P0 = box "core_ops"
+    oplib = new ['OpLib'], $P0
 
     probe_class = get_hll_global ['Instrument'], 'Probe'
     probe       = probe_class.'new'()
diff --git a/t/instrumentop.t b/t/instrumentop.t
index ead00f0..b9b08a8 100644
--- a/t/instrumentop.t
+++ b/t/instrumentop.t
@@ -63,7 +63,6 @@ PROG
 .sub test_one_op
     # Test a single opcode.
     .local pmc instr, probe, probe_class, args
-
     instr = new ['Instrument']
 
     # Set up the program args.
diff --git a/t/library/IGNORE b/t/library/IGNORE
index 396b73a..3bcceb3 100644
--- a/t/library/IGNORE
+++ b/t/library/IGNORE
@@ -1,2 +1,6 @@
+<<<<<<< HEAD
 Ignore this file. It only exists to make sure the t/dynpmc directory is
 included in the git repo
+=======
+Ignore this file.
+>>>>>>> 00aea75a6cd0dd51fa979ac8c4240cd92307696a