Final touches before 3.2.0