fix up of issues created removal of support for older compilers

[SVN r86588]
fix up of issues created by removal of support for older compilers

[SVN r86589]