Fix come more coding standards errors.