Fixes after merging with upstream
Fixes after merging with upstream

GroestlCoin/bitcoin,GroestlCoin/bitcoin,GroestlCoin/GroestlCoin,GroestlCoin/bitcoin,GroestlCoin/GroestlCoin,GroestlCoin/GroestlCoin,GroestlCoin/GroestlCoin,GroestlCoin/bitcoin,GroestlCoin/GroestlCoin,GroestlCoin/bitcoin,GroestlCoin/GroestlCoin,GroestlCoin/bitcoin