OSPL-3678 Fix for clang compilation and fix for solaris