Fix the way FIFOs are handled.