Fixes for bugs introduced by last update.  Oops.