SC-85 Fix some inspections issues