Final polish for 3.1