Adjust code to work with unpatched bitcoind-r1

I had to make some very minor adjustments