Fixed Dependency issues