Misra Warnings fixed