Fixes for 1.3.2