Transaction support + tiny fixups