minor fixes for conventions