Various bugfixes on 3.2 branch