Walrus: Cosmetic changes