Issue 19550: More fixes from code review