Minor changes to reflect the upgrade to Weatherwax