minor fixes for consistency