Dependency Fixes