Fixing some stuff as suggested by @hnrch02 in pull #14154
compiled everything