Fixes for 3.2.11 support