Tweaks for 6.0.1 (the first wider release).