Minor changes

This is a strategy I've been using for quite awhile, fwiw.