Fixes for 3.2