Some Dependency Fixes