Fix units propagation and conflicts.