More changes for #2905