Maintenance after merging code from others.