2.5.0 pre-release fixes