Couple Minor Tweaks.  Ready for 3.0.5