#9191: More fixes