Small fixes for consistency.