Coding convention fixes