A number of small changes