Random Tweaks

Apparently I never committed these changes 6 months ago.  So I don't
remember what they are.