Fixes to coding conventions violations

No match.