v3.2 fix as well as small improvements