Merge fixes from `master`.