More changes to keep up to date with the master branch