Fix unit coherence