Further compiling fixes (issue #17581)
1 file changed