More changes for #364