Hotfixes

Fixes #227 in 3.2