diff --git a/Installed/Library/Breadbox/Fjpeg/Makefile b/Installed/Library/Breadbox/Fjpeg/Makefile
index 50e652a59..890065ca3 100644
--- a/Installed/Library/Breadbox/Fjpeg/Makefile
+++ b/Installed/Library/Breadbox/Fjpeg/Makefile
@@ -3,16 +3,6 @@
 #
 # If you edit it, you will lose your changes, should it be regenerated.
 #
-<<<<<<<< HEAD:Installed/Library/FMTools/OpenWith/Makefile
-GEODE           = openwith
-ASM_TO_OBJS     =
-UI_TO_RDFS      =
-SRCS            = openwith.goc openwith.goh
-OBJS            = openwith.obj
-LOBJS           =
-LIBOBJ          = $(DEVEL_DIR)/Include/$(GEODE).ldf
-LIBNAME         = openwith
-========
 GEODE           = fjpeg
 CODE            = decode.c init.c main.c
 UI_TO_RDFS      =
@@ -24,7 +14,6 @@ SRCS            = $(CODE) $(COMMON)
 LOBJS           =
 LIBOBJ          = $(DEVEL_DIR)/Include/$(GEODE).ldf
 LIBNAME         = fjpeg
->>>>>>>> a015975b (Add files via upload):Installed/Library/Breadbox/Fjpeg/Makefile
 
 SYSMAKEFILE     = geode.mk
 
diff --git a/Library/Breadbox/ImpGraph/IMPBMP/impfjpeg.goc b/Library/Breadbox/ImpGraph/IMPBMP/impfjpeg.goc
index 640e2d251..ec74f68ca 100644
--- a/Library/Breadbox/ImpGraph/IMPBMP/impfjpeg.goc
+++ b/Library/Breadbox/ImpGraph/IMPBMP/impfjpeg.goc
@@ -1,12 +1,12 @@
 /* FJPEG for product only */
 @ifdef PRODUCT_FJPEG
 @include <stdapp.goh>
-#include <Ansi\stdio.h>
-#include <..\..\Fjpeg\fjpeg.h>
+#include <Ansi/stdio.h>
+#include <../../Fjpeg/fjpeg.h>
 #include <gstring.h>
-#include <Ansi\string.h>
-#include <Ansi\stdlib.h>
-@include "IMPBMP\impjpeg.h"
+#include <Ansi/string.h>
+#include <Ansi/stdlib.h>
+@include "IMPBMP/impjpeg.h"
 #include <initfile.h>
 @include <htmldrv.h>
 
diff --git a/Tools/build/product/bbxensem/Template/geos.ini b/Tools/build/product/bbxensem/Template/geos.ini
index 3d19124a2..52d922e65 100644
--- a/Tools/build/product/bbxensem/Template/geos.ini
+++ b/Tools/build/product/bbxensem/Template/geos.ini
@@ -39,6 +39,7 @@ useDialingOptions = 0
 promptSecret = 0
 localDialingOptions = 0
 name = Host Network
+phone = +
 netType = 2
 default = 1