diff --git a/data/schema/core/config.cfg b/data/schema/core/config.cfg
index 694fc3c3b908..2b8089dc9a3e 100644
--- a/data/schema/core/config.cfg
+++ b/data/schema/core/config.cfg
@@ -46,7 +46,7 @@
 		name="server"
 		max=infinite
 		{SIMPLE_KEY name t_string}
-		{SIMPLE_KEY address string} # TODO: Validate as hostname:port
+		{SIMPLE_KEY address server_address}
 	[/tag]
 	[tag]
 		name="colors"
diff --git a/data/schema/game_config.cfg b/data/schema/game_config.cfg
index fa811425735b..e7196f883f0c 100644
--- a/data/schema/game_config.cfg
+++ b/data/schema/game_config.cfg
@@ -55,6 +55,16 @@
         name="defeat_condition"
         value="no_leader_left|no_units_left|never|always"
     [/type]
+    [type]
+        name=point
+        [list]
+            min=1
+            max=2
+            [element]
+                link="int"
+            [/element]
+        [/list]
+    [/type]
     [type]
         name=range
         [list]
@@ -157,6 +167,10 @@
             [/element]
         [/list]
     [/type]
+    [type]
+        name="server_address"
+        value="[_a-zA-Z0-9-]+(\.[_a-zA-Z0-9-]+)+:\d+"
+    [/type]
     [tag]
         name="root"
         min=1
diff --git a/data/schema/terrain/graphics.cfg b/data/schema/terrain/graphics.cfg
index 307f8566339a..6202c1484443 100644
--- a/data/schema/terrain/graphics.cfg
+++ b/data/schema/terrain/graphics.cfg
@@ -32,7 +32,7 @@
 			{SIMPLE_KEY name string}
 			{DEFAULT_KEY random_start bool,int yes}
 			{SIMPLE_KEY position string} # Not documented
-			{SIMPLE_KEY base range_list} # TODO: This is really a point x,y
+			{SIMPLE_KEY base point}
 			{SIMPLE_KEY variations string} # Not documented
 			{SIMPLE_KEY is_water bool} # Not documented
 			[tag]
@@ -50,6 +50,6 @@
 		name="image"
 		max=infinite
 		super="terrain_graphics/tile/image"
-		{SIMPLE_KEY center range_list} # TODO: This is really a point x,y
+		{SIMPLE_KEY center point}
 	[/tag]
 [/tag]
\ No newline at end of file