Fix bugs in the time trial scanner