Shell transaction management fixes