Fixes for btcutil and btcscript api changes