A few changes to resolve repository conflicts.