More multisig fixes