Some smaller cosmetic changes