New inspections+fixes