Remove compiler warnings generated by newer clang compiler