diff --git a/custom/4coder_lists.cpp b/custom/4coder_lists.cpp
index 1c3a5f13..443c5f74 100644
--- a/custom/4coder_lists.cpp
+++ b/custom/4coder_lists.cpp
@@ -397,7 +397,7 @@ get_file_name_from_user(Application_Links *app, Arena *arena, String_Const_u8 qu
         result.file_name_in_text_field = string_front_of_path(l_result.text_field);
         
         String_Const_u8 path = {};
-        if (!result.is_folder && result.file_name_in_text_field.size == 0 && l_result.text_field.size > 0){
+        if (l_result.user_data == 0 && result.file_name_in_text_field.size == 0 && l_result.text_field.size > 0){
             result.file_name_in_text_field = string_front_folder_of_path(l_result.text_field);
             path = string_remove_front_folder_of_path(l_result.text_field);
         }
diff --git a/custom/metadata_generator.dSYM/Contents/Info.plist b/custom/metadata_generator.dSYM/Contents/Info.plist
deleted file mode 100644
index a05ad97b..00000000
--- a/custom/metadata_generator.dSYM/Contents/Info.plist
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-	<dict>
-		<key>CFBundleDevelopmentRegion</key>
-		<string>English</string>
-		<key>CFBundleIdentifier</key>
-		<string>com.apple.xcode.dsym.metadata_generator</string>
-		<key>CFBundleInfoDictionaryVersion</key>
-		<string>6.0</string>
-		<key>CFBundlePackageType</key>
-		<string>dSYM</string>
-		<key>CFBundleSignature</key>
-		<string>????</string>
-		<key>CFBundleShortVersionString</key>
-		<string>1.0</string>
-		<key>CFBundleVersion</key>
-		<string>1</string>
-	</dict>
-</plist>
diff --git a/custom/metadata_generator.dSYM/Contents/Resources/DWARF/metadata_generator b/custom/metadata_generator.dSYM/Contents/Resources/DWARF/metadata_generator
deleted file mode 100644
index 815fd871..00000000
Binary files a/custom/metadata_generator.dSYM/Contents/Resources/DWARF/metadata_generator and /dev/null differ
diff --git a/project.4coder b/project.4coder
index a4a31ba8..a61663bb 100644
--- a/project.4coder
+++ b/project.4coder
@@ -6,6 +6,7 @@ patterns = {
 "*.cpp",
 "*.h",
 "*.m",
+"*.mm",
 "*.bat",
 "*.sh",
 "*.4coder",
diff --git a/ship_files/config.4coder b/ship_files/config.4coder
index bfe0fc32..b59a01cc 100644
--- a/ship_files/config.4coder
+++ b/ship_files/config.4coder
@@ -23,7 +23,7 @@ lister_whole_word_backspace_when_modified = false;
 show_line_number_margins = false;
 
 // Code Wrapping
-treat_as_code = ".cpp.c.hpp.h.cc.cs.java.rs.glsl.m";
+treat_as_code = ".cpp.c.hpp.h.cc.cs.java.rs.glsl.m.mm";
 enable_virtual_whitespace = true;
 enable_code_wrapping = true;
 automatically_adjust_wrapping = true;
diff --git a/ship_files_super/project.4coder b/ship_files_super/project.4coder
index b976c45d..261a97f0 100644
--- a/ship_files_super/project.4coder
+++ b/ship_files_super/project.4coder
@@ -6,6 +6,7 @@ patterns = {
 "*.cpp",
 "*.h",
 "*.m",
+"*.mm",
 "*.bat",
 "*.sh",
 "*.4coder",