Sails fixes