more convention fixes