More changes for stability with varying ATLAS, etc.