v3.3.2: various minor fixes

Signed-off-by: Chris “Kwpolska” Warrick <kwpolska@gmail.com>
Merge branch 'release/3.3.2' into develop