More updates for 3.x