diff --git a/uppsrc/Core/Core.upp b/uppsrc/Core/Core.upp
index b5c6633c4..ca1c5b94d 100644
--- a/uppsrc/Core/Core.upp
+++ b/uppsrc/Core/Core.upp
@@ -32,7 +32,7 @@ link(SOLARIS) "-Wl,-R -Wl,/usr/local/lib";
 link(GCC POSIX STACKTRACE) -rdynamic;
 
 file
-	Core.h options PCH,
+	Core.h options(BUILDER_OPTION) PCH,
 	config.h,
 	Defs.h,
 	Cpu.cpp optimize_speed,
diff --git a/uppsrc/Painter/SvgUtil.cpp b/uppsrc/Painter/SvgUtil.cpp
index 7deec8bcd..4887232a2 100644
--- a/uppsrc/Painter/SvgUtil.cpp
+++ b/uppsrc/Painter/SvgUtil.cpp
@@ -205,7 +205,7 @@ Array<double> GetTransformArgs(String str, const char *command) {
 	if ((pos = str.Find(command)) < 0) 
 		return args;
 	
-	pos += strlen(command);
+	pos += (int)strlen(command);
 	pos = 1 + str.Find('(', pos);
 	
 	while (true) {