Bug fixes from merge difficulties.