A few additional cosmetic changes