Compilation fixes after merge PR #4669