More reliability fixes/enhancements.  Hopefully this will catch the remaining
problems I've seen happen.