changes/fixes for 3.4