Clear some clang warnings

Unfortunately, I can't take abi breaking changes at this point.  So no type changes in any public headers