Fix coding standards issues