MISRA Warnings More Fixes