Fixes for 3.x