FIFO simulation fixes.