More changes from master