Fixing all dependecy issues