Dependency fix and update