Minor inspection fixes