Coding conventions fixes