Some small, more cosmetic changes