Tweaks for 3.0 launch.