Some changes after final testing of FIFO and RB