Code clean up and handling FIFO errors

common/platform.h/shortlog@b5d57daeb7c0: not found in manifest