Resolve the main dependency issues