#1636,#1752 Cosmetic changes