Fix tlog race

Still running some CI tests for the second commit here, but expecting no problems there