Further cosmetic changes