Fix coding standards warning and errors