More code hardening for CLANG

bug 403