Even more cosmetic changes