More minor fixing regarding capitalization issues.