plumage-patch

index 21ab9e6..3f89ccb 100644
--- a/src/lib/Plumage/NQPUtil.nqp
+++ b/src/lib/Plumage/NQPUtil.nqp
@@ -409,7 +409,7 @@ sub subst($original, $regex, $replacement) {
             $I1 = $P2
             $P3 = find_lex '$replace_string'
             $S1 = $P3
-            substr $S0, $I0, $I1, $S1
+            replace $S0, $S0, $I0, $I1, $S1
             $P0 = $S0
        };

@@ -878,6 +878,8 @@ INIT {
     my $interp  := pir::getinterp__P();
     my @argv    := $interp[2];   # IGLOBALS_ARGV_LIST
     my $config  := $interp[6];   # IGLOBALS_CONFIG_HASH
+    my $os      := pir::loadlib__PS('os');
+    my $bitwise := pir::loadlib__PS('bit_ops');

     # Only fill the config portion of %*VM for now
     my %vm;