More changes to try and get standalone regression tools working.