Small fixes, almost ready for 3.2 release
Changelog addition