minor bugfixes, #24047