Fix MISRA 2004 issues.