Some final cosmetic changes