addresses clang++ warnings
added new clang++ fix