Some convention fixes