Minor controlling changes.