added changes to stop CLANG compiler warnings.