2.4 changes and fixes