diff --git a/demos/STM32/NIL-STM32L011K4-NUCLEO32/.project b/demos/STM32/NIL-STM32L011K4-NUCLEO32/.project
index c44f326b8..9937af08c 100644
--- a/demos/STM32/NIL-STM32L011K4-NUCLEO32/.project
+++ b/demos/STM32/NIL-STM32L011K4-NUCLEO32/.project
@@ -79,7 +79,7 @@
 		<link>
 			<name>board</name>
 			<type>2</type>
-			<location>C:/ChibiStudio/chibios_trunk/os/hal/boards/ST_NUCLEO32_L011K4</location>
+			<locationURI>CHIBIOS/os/hal/boards/ST_NUCLEO32_L011K4</locationURI>
 		</link>
 		<link>
 			<name>os</name>
diff --git a/demos/STM32/NIL-STM32L011K4-NUCLEO32/Makefile b/demos/STM32/NIL-STM32L011K4-NUCLEO32/Makefile
index aa817d62a..d66563a6f 100644
--- a/demos/STM32/NIL-STM32L011K4-NUCLEO32/Makefile
+++ b/demos/STM32/NIL-STM32L011K4-NUCLEO32/Makefile
@@ -5,7 +5,7 @@
 
 # Compiler options here.
 ifeq ($(USE_OPT),)
-  USE_OPT = -O0 -ggdb -fomit-frame-pointer -falign-functions=16
+  USE_OPT = -Os -ggdb -fomit-frame-pointer -falign-functions=16
 endif
 
 # C specific options here (added to USE_OPT).
diff --git a/demos/STM32/RT-STM32L031K6-NUCLEO32/.project b/demos/STM32/RT-STM32L031K6-NUCLEO32/.project
index cde752ade..71c1fcdce 100644
--- a/demos/STM32/RT-STM32L031K6-NUCLEO32/.project
+++ b/demos/STM32/RT-STM32L031K6-NUCLEO32/.project
@@ -27,7 +27,7 @@
 		<link>
 			<name>board</name>
 			<type>2</type>
-			<location>C:/ChibiStudio/chibios_trunk/os/hal/boards/ST_NUCLEO32_L031K6</location>
+			<locationURI>CHIBIOS/os/hal/boards/ST_NUCLEO32_L031K6</locationURI>
 		</link>
 		<link>
 			<name>os</name>