Apply 3.1.0 last minute changes.