[code_reorg] Fixing in IAR