Small fixes as suggested by @hnrch02 in pull # 14153