Final changes for 2.5