Resolve basic dependency issues