Minor fixes for consistency.