Several small cosmetic changes