various fixes, hangs in TxUpgrade