Release 3.2.1

Bug fixes