Updates for 2.5

This is still a work-in-progress