Final changes for 2.4