Inspection fixes.