diff --git a/neo/framework/DeclManager.cpp b/neo/framework/DeclManager.cpp
index 9397339e..4e903df9 100644
--- a/neo/framework/DeclManager.cpp
+++ b/neo/framework/DeclManager.cpp
@@ -2631,6 +2631,27 @@ void idDeclManagerLocal::ExportDeclsToTrenchBroom_f( const idCmdArgs& args )
 			file->Printf( "= %s : \"%s\"\n", decl->GetName(), text.c_str() );
 			file->Printf( "[\n" );
 
+			if( idStr::Icmp( decl->GetName(), "light" ) == 0 )
+			{
+				// RB: hardcode for now to have proper light styles combobox names
+				file->Printf(
+					"\tstyle(Choices) : \"Appearance\" : 0 =\n"
+					"\t[\n"
+					"\t\t0 : \"Normal\"\n"
+					"\t\t10: \"Fluorescent flicker\"\n"
+					"\t\t2 : \"Slow, strong pulse\"\n"
+					"\t\t11: \"Slow pulse, noblack\"\n"
+					"\t\t5 : \"Gentle pulse\"\n"
+					"\t\t1 : \"Flicker A\"\n"
+					"\t\t6 : \"Flicker B\"\n"
+					"\t\t3 : \"Candle A\"\n"
+					"\t\t7 : \"Candle B\"\n"
+					"\t\t8 : \"Candle C\"\n"
+					"\t\t4 : \"Fast strobe\"\n"
+					"\t\t9 : \"Slow strobe\"\n"
+					"\t]\n" );
+			}
+
 			for( int i = 0; i < dictToWrite.GetNumKeyVals(); i++ )
 			{
 				kv = dictToWrite.GetKeyVal( i );
diff --git a/neo/framework/FileSystem.cpp b/neo/framework/FileSystem.cpp
index d5d78cb8..bef7166c 100644
--- a/neo/framework/FileSystem.cpp
+++ b/neo/framework/FileSystem.cpp
@@ -2279,8 +2279,9 @@ int idFileSystemLocal::GetFileList( const char* relativePath, const idStrList& e
 				// make sure the file is not in a subdirectory
 				int j = pathLength;
 
-				// RB: subdirectories are good!!!
-#if 0
+				// RB: FIXME expose this to an option for exportModelsToTrenchBroom
+				// so it doesn't break loading of sounds
+#if 1
 				for( ; rt.filename[j + 1] != '\0'; j++ )
 				{
 					if( rt.filename[ j ] == '/' )