diff --git a/uppsrc/Core/SSL/P7S.icpp b/uppsrc/Core/SSL/P7S.icpp
index fca7c989b..2393642a6 100644
--- a/uppsrc/Core/SSL/P7S.icpp
+++ b/uppsrc/Core/SSL/P7S.icpp
@@ -14,7 +14,7 @@ String GetP7Signature_imp(const void *data, int length, const String& cert_pem,
 	SslStream in;
 	in.OpenBuffer((const char *)data, length);
 
-    PKCS7 *p7 = PKCS7_sign(x509, pkey, NULL, in, PKCS7_DETACHED|PKCS7_STREAM|PKCS7_BINARY);
+    PKCS7 *p7 = PKCS7_sign(x509, pkey, NULL, in, PKCS7_DETACHED|PKCS7_BINARY);
 
     if (!p7)
         return Null;
@@ -23,7 +23,7 @@ String GetP7Signature_imp(const void *data, int length, const String& cert_pem,
 	out.CreateBuffer();
 
 	String r;
-    if (SMIME_write_PKCS7(out, p7, in, PKCS7_DETACHED|PKCS7_STREAM|PKCS7_BINARY)) {
+    if (SMIME_write_PKCS7(out, p7, in, PKCS7_DETACHED|PKCS7_BINARY)) {
 		SslStream out1;
 		out1.CreateBuffer();
 		i2d_PKCS7_bio(out1, p7);
diff --git a/uppsrc/PdfDraw/PdfDraw.cpp b/uppsrc/PdfDraw/PdfDraw.cpp
index 336277f71..15ec66a4d 100644
--- a/uppsrc/PdfDraw/PdfDraw.cpp
+++ b/uppsrc/PdfDraw/PdfDraw.cpp
@@ -36,7 +36,7 @@ void  PdfDraw::Clear()
 	out.Clear();
 	page.Clear();
 	offset.Clear();
-	out << "%PDF-1.7\n";
+	out << "%PDF-1.3\n";
 	out << "%\xf1\xf2\xf3\xf4\n\n";
 	empty = true;
 }
@@ -983,7 +983,7 @@ String PdfDraw::Finish(PdfSignatureInfo *sign)
 		out << "<< /Type /Sig\n";
 		out << "/Contents <";
 		p7s_start = out.GetCount();
-		out << String('0', 3000);
+		out << String('0', 30000);
 		p7s_end = out.GetCount();
 		out << ">\n";
 		out << "/ByteRange [0 " << p7s_start << ' ' << p7s_end << ' ';
@@ -991,7 +991,8 @@ String PdfDraw::Finish(PdfSignatureInfo *sign)
 		      //1234567890 -  %10d
 		out << "**********]\n";
 		out << "/Filter /Adobe.PPKLite\n";
-		out << "/SubFilter /adbe.pkcs7.detached\n";
+//		out << "/SubFilter /adbe.pkcs7.detached\n";
+		out << "/SubFilter /adbe.pkcs7.sha1\n";
 		Time tm = Nvl(sign->time, GetSysTime());
 		out << Format("/M (%02d%02d%02d%02d%02d%02d+02'00')\n", tm.year, tm.month, tm.day, _DBG_ // fix time zone
 		              tm.hour, tm.minute, tm.second);
@@ -1008,7 +1009,7 @@ String PdfDraw::Finish(PdfSignatureInfo *sign)
 		out << "/Reference [ << /Type /SigRef\n"
 		       "  /TransformMethod /UR3\n"
 		       "  /TransformParams <<\n"
-		       "     /Type /TransformParams\n";
+		       "     /Type /TransformParams\n"
 		       "     /V /2.2\n";
 		out << ">> >> ]\n";
 		out << ">>\n";
@@ -1129,7 +1130,7 @@ String PdfDraw::Finish(PdfSignatureInfo *sign)
 		meta_head << "/Type/Metadata/Subtype/XML";
 		
 		pdfa_metadata = PutStream(metadata, meta_head, false);
-	}	
+	}
 	
 	int catalog = BeginObj();
 	out << "<< /Type /Catalog\n"