Further updates for 2.5.0