Additional capitalization fixes