Small design fixes. #15691087372498