Resolve local dependency issues