Updates that were missed during the merge from blackcoin master