diff --git a/constants/constants.go b/constants/constants.go
index 366b22b0..88b3340c 100644
--- a/constants/constants.go
+++ b/constants/constants.go
@@ -44,6 +44,7 @@ const BUILD_PROPERTIES_BUILD_CORE_PATH = "build.core.path"
 const BUILD_PROPERTIES_BUILD_MCU = "build.mcu"
 const BUILD_PROPERTIES_BUILD_PATH = "build.path"
 const BUILD_PROPERTIES_BUILD_PROJECT_NAME = "build.project_name"
+const BUILD_PROPERTIES_BUILD_PROJECT_PATH = "build.project_path"
 const BUILD_PROPERTIES_BUILD_SYSTEM_PATH = "build.system.path"
 const BUILD_PROPERTIES_BUILD_VARIANT = "build.variant"
 const BUILD_PROPERTIES_BUILD_VARIANT_PATH = "build.variant.path"
diff --git a/container_find_includes.go b/container_find_includes.go
index a58ea68c..38176f7e 100644
--- a/container_find_includes.go
+++ b/container_find_includes.go
@@ -400,7 +400,16 @@ func queueSourceFilesFromFolder(ctx *types.Context, queue *types.UniqueSourceFil
 		if err != nil {
 			return i18n.WrapError(err)
 		}
-		queue.Push(sourceFile)
+		/*
+		 * hack: This is for Energia EMT targets to skip main.cpp
+		 * When the cache file is build the first time, main.cpp is not there yet
+		 * in the <build folder>/sketch.
+		 * On a second run it is there and the cache mismatches that of what is on disk
+		 * resulting in a pointer outside the cache array.
+		 */
+		if sourceFile.RelativePath != "main.cpp" {
+			queue.Push(sourceFile)
+		}
 	}
 
 	return nil
diff --git a/setup_build_properties.go b/setup_build_properties.go
index c1983551..0685f350 100644
--- a/setup_build_properties.go
+++ b/setup_build_properties.go
@@ -62,6 +62,7 @@ func (s *SetupBuildProperties) Run(ctx *types.Context) error {
 	}
 	if ctx.Sketch != nil {
 		buildProperties[constants.BUILD_PROPERTIES_BUILD_PROJECT_NAME] = filepath.Base(ctx.Sketch.MainFile.Name)
+		buildProperties[constants.BUILD_PROPERTIES_BUILD_PROJECT_PATH] = filepath.Dir(ctx.Sketch.MainFile.Name)
 	}
 	buildProperties[constants.BUILD_PROPERTIES_BUILD_ARCH] = strings.ToUpper(targetPlatform.PlatformId)