various inspection fixes