Code clean up and handling FIFO errors

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