#29799 some minor fixes