Resolve some dependencies problems