ENH: Patch fixes signature needed for modern compilers (llvm)