Misra Violations fixed