More changes for v2.9