Fixes from merge.