Fix a couple more tiny consistency issues