transaction and util fixes (align with PoC5)