Tweaks on capitalization