Resolve dependences problems