Minor transaction callback cleanups