Code clean up and handling FIFO errors

common/utils.h/shortlog/shortlog@09d58952b65d: not found in manifest