diff --git a/Source/Core/Controls/ThingBrowserControl.cs b/Source/Core/Controls/ThingBrowserControl.cs
index c29ad1fda16f5112db7ed79cb2b2694ca8e5cc82..30937207b6e9d93f3acf2d035cbd22ac14d27fb6 100644
--- a/Source/Core/Controls/ThingBrowserControl.cs
+++ b/Source/Core/Controls/ThingBrowserControl.cs
@@ -359,7 +359,7 @@ namespace CodeImp.DoomBuilder.Controls
 							// Select this
 							if(n.TreeView != null) //mxd. Tree node may've been removed during filtering
 							{
-								n.Parent.Expand();
+								if(n.Parent != null) n.Parent.Expand(); // node won't have parent when the list is prefiltered
 								typelist.SelectedNodes.Add(n);
 								n.EnsureVisible();
 								break;
diff --git a/Source/Core/Resources/SkySphere.md3 b/Source/Core/Resources/SkySphere.md3
index b0ad8cff19215aac2f675657bd5f7fbe7dcbdeb0..536069daa00d57149bfb1ac50b9a77bc7bddb7ec 100644
Binary files a/Source/Core/Resources/SkySphere.md3 and b/Source/Core/Resources/SkySphere.md3 differ
diff --git a/Source/Core/ZDoom/ZDTextParser.cs b/Source/Core/ZDoom/ZDTextParser.cs
index 710a6896cb87d754be6bc46769351c1d4b648d62..481f26bfbf7ff8bd00725c7b09c28fd46d3dd1ef 100644
--- a/Source/Core/ZDoom/ZDTextParser.cs
+++ b/Source/Core/ZDoom/ZDTextParser.cs
@@ -485,6 +485,9 @@ namespace CodeImp.DoomBuilder.ZDoom
 		protected void SkipStructure() { SkipStructure(new HashSet<string>()); }
 		protected void SkipStructure(HashSet<string> breakat)
 		{
+			// We need it to be case-insensitive
+			if(breakat.Count > 0) breakat = new HashSet<string>(breakat, StringComparer.OrdinalIgnoreCase);
+			
 			string token;
 			do
 			{