diff --git a/OSC/Source/OSC/OSC.Build.cs b/OSC/Source/OSC/OSC.Build.cs
index d3af943..77db251 100644
--- a/OSC/Source/OSC/OSC.Build.cs
+++ b/OSC/Source/OSC/OSC.Build.cs
@@ -29,33 +29,23 @@ namespace UnrealBuildTool.Rules
 				}
 			);
 
-            PublicIncludePaths.AddRange(
-				new string[] {
-					"OSC/Public",
-					"OSC/Public/Common",
-					"OSC/Public/Receive",
-					"OSC/Public/Send",
-				}
-            );
-
 			PrivateIncludePaths.AddRange(
 				new string[] {
 					"OSC/Private",
 					"OSC/Private/Common",
 					"OSC/Private/Receive",
-					"OSC/Private/Send",
 				}
 			);
 
             if (Target.Type == TargetRules.TargetType.Editor)
             {
-                Definitions.Add("OSC_EDITOR_BUILD=1");
+                PublicDefinitions.Add("OSC_EDITOR_BUILD=1");
 
                 PrivateDependencyModuleNames.Add("UnrealEd");
             }
             else
             {
-                Definitions.Add("OSC_EDITOR_BUILD=0");
+                PublicDefinitions.Add("OSC_EDITOR_BUILD=0");
             }
         }
 	}
diff --git a/OSC/Source/OSC/Private/OscSettings.cpp b/OSC/Source/OSC/Private/OscSettings.cpp
index ce6b136..602e772 100644
--- a/OSC/Source/OSC/Private/OscSettings.cpp
+++ b/OSC/Source/OSC/Private/OscSettings.cpp
@@ -163,7 +163,7 @@ bool UOscSettings::Parse(const FString & ip_port, FIPv4Address * address, uint32
             return false;
         }
 
-        const auto ip = ip_port.Left(sep).Trim();
+        const auto ip = ip_port.Left(sep).TrimStartAndEnd();
         if(!FIPv4Address::Parse(ip, addressResult))
         {
             return false;
diff --git a/OSC/Source/OSC/Private/OscSettings.h b/OSC/Source/OSC/Private/OscSettings.h
index ee571f5..8f5fb3e 100644
--- a/OSC/Source/OSC/Private/OscSettings.h
+++ b/OSC/Source/OSC/Private/OscSettings.h
@@ -62,9 +62,11 @@ public:
     void ClearKeyInputs(UOscDispatcher & dispatcher);
 
     void UpdateKeyInputs(UOscDispatcher & dispatcher);
+
 #if WITH_EDITOR
     void PostEditChangeProperty( struct FPropertyChangedEvent& PropertyChangedEvent) override;
 #endif
+
 public:
 
     enum class ParseOption