Fixed Dependency Issues