BIP-85 small tweaks