Small inspection fixes