A few rather small changes