convention fixes