CS/convention fixes