More 2.7.4 changes