Bug fixes from merge.