Tied down the dependencies and fix spec failures