Fixes to previous commit where I accidentally discarded changes I made.  oops.