More fixes to coding conventions