diff --git a/uppsrc/Oracle/Oci8.cpp b/uppsrc/Oracle/Oci8.cpp
index 85d06950e..84565ce85 100644
--- a/uppsrc/Oracle/Oci8.cpp
+++ b/uppsrc/Oracle/Oci8.cpp
@@ -511,7 +511,7 @@ bool OCI8Connection::BulkExecute(const char *stmt, const Vector< Vector<Value> >
 
 		if(sql_type == 0)
 			sql_type = SQLT_STR;
-		unsigned sum_len = nrows * max_row_len;
+		int sum_len = nrows * max_row_len;
 		Item& p = param.Add(new Item(oci8));
 		p.Alloc(nrows, session->envhp, sql_type, sum_len, 0);
 		p.dyna_vtype = VOID_V;
@@ -554,7 +554,7 @@ bool OCI8Connection::BulkExecute(const char *stmt, const Vector< Vector<Value> >
 				break;
 			}
 			case SQLT_DAT: {
-				ASSERT(sum_len >= nrows * 7u);
+				ASSERT(sum_len >= nrows * 7);
 				byte *datp = p.Data();
 				for(int r = 0; r < nrows; r++) {
 					Time d = (param_rows[r].GetCount() > a ? (Time)param_rows[r][a] : (Time)Null);
@@ -578,7 +578,7 @@ bool OCI8Connection::BulkExecute(const char *stmt, const Vector< Vector<Value> >
 					memcpy(datp, s, rawlen);
 					datp += max_row_len;
 				}
-				ASSERT((unsigned)(datp - (byte *)p.Data()) <= sum_len);
+				ASSERT((int)(datp - (byte *)p.Data()) <= sum_len);
 				break;
 			}
 			default: {
diff --git a/uppsrc/Painter/Painter.upp b/uppsrc/Painter/Painter.upp
index 169cf6a02..b092bfb60 100644
--- a/uppsrc/Painter/Painter.upp
+++ b/uppsrc/Painter/Painter.upp
@@ -4,8 +4,7 @@ uses
 	Draw;
 
 file
-	Painter.h
-		options() PCH,
+	Painter.h options(BUILDER_OPTION) PCH,
 	Painter.hpp,
 	Painter.cpp,
 	SvgArc.cpp,
diff --git a/uppsrc/Painter/init b/uppsrc/Painter/init
index 83d3403ae..f401caed3 100644
--- a/uppsrc/Painter/init
+++ b/uppsrc/Painter/init
@@ -1,7 +1,7 @@
 #ifndef _Painter_icpp_init_stub
 #define _Painter_icpp_init_stub
 #include "Draw/init"
-#define BLITZ_INDEX__ Fb59219fc3bf1aed0b7289197596b0ec3
+#define BLITZ_INDEX__ Fcf1e6c345d9100ecf96ca5bd96de6ce3
 #include "PaintPainting.icpp"
 #undef BLITZ_INDEX__
 #endif
diff --git a/uppsrc/plugin/pcre/pcre.upp b/uppsrc/plugin/pcre/pcre.upp
index 5ee3f0b15..b072295da 100644
--- a/uppsrc/plugin/pcre/pcre.upp
+++ b/uppsrc/plugin/pcre/pcre.upp
@@ -1,5 +1,9 @@
 description "PCRE regular expressions library\3770,128,128";
 
+noblitz;
+
+options(BUILDER_OPTION) NOWARNINGS;
+
 file
 	Pcre.h,
 	RegExp.h,