More changes to support sander runs