Minor fixes. FRR still behaving sort of like FCFS.