more bip32 related fixes