Update dependencies and make specs pass