Fixes for bugs noticed by Mike's clean install of MESS