Fix some issues with Transaction Logging