Fix most signature mismatches