Updated everything to lift sails on 0.10.5 (latest)