Repair after merge master to overview