fixes to match the new sails