Backport fixes from 1.6.4.