More small cosmetic changes