Merge fixes from Truthcoin-POW