Fix various version conflicts.