Small transaction fixes here and there