Some more adjustments to the fifo.c