A few rather cosmetic changes