diff --git a/indra/linux_updater/linux_updater.cpp b/indra/linux_updater/linux_updater.cpp
index b93890ab32578c6163d9da54c897b98e39d5a777..4b0bf6a2d9f94b5c7dfc23acf4edad7089131a3f 100644
--- a/indra/linux_updater/linux_updater.cpp
+++ b/indra/linux_updater/linux_updater.cpp
@@ -90,7 +90,7 @@ bool translate_init(std::string comma_delim_path_list,
 
 	// extract paths string vector from comma-delimited flat string
 	std::vector<std::string> paths;
-	LLStringUtil::getTokens(comma_delim_path_list, paths); // split over ','
+	LLStringUtil::getTokens(comma_delim_path_list, paths, ","); // split over ','
 
 	// suck the translation xml files into memory
 	LLXMLNodePtr root;
diff --git a/indra/llaudio/CMakeLists.txt b/indra/llaudio/CMakeLists.txt
index 80245fd569b9c52e558d8a8ffaa513a99ea98ded..9e9e1aaeaecf4121ef51793b30ee500c6f59d580 100644
--- a/indra/llaudio/CMakeLists.txt
+++ b/indra/llaudio/CMakeLists.txt
@@ -62,7 +62,8 @@ if (FMOD)
     if (LINUX)
       if (${CXX_VERSION} MATCHES "4.[23]")
         set_source_files_properties(llaudioengine_fmod.cpp
-                                    COMPILE_FLAGS -Wno-error=write-strings)
+                                    llstreamingaudio_fmod.cpp
+                                    COMPILE_FLAGS -Wno-write-strings)
       endif (${CXX_VERSION} MATCHES "4.[23]")
     endif (LINUX)
 endif (FMOD)