Dependencies order corrections.