Resolve dependency issues