Small cleanups although FIFO still doesn't work