Capitalization bug fixes