diff --git a/cmake/macros/SymlinkOrCopyDirectoryBesideTarget.cmake b/cmake/macros/SymlinkOrCopyDirectoryBesideTarget.cmake
index 6e82358e35..d64e6821e3 100644
--- a/cmake/macros/SymlinkOrCopyDirectoryBesideTarget.cmake
+++ b/cmake/macros/SymlinkOrCopyDirectoryBesideTarget.cmake
@@ -21,13 +21,13 @@ macro(SYMLINK_OR_COPY_DIRECTORY_BESIDE_TARGET _SHOULD_SYMLINK _DIRECTORY _DESTIN
   else ()
     # remove the current directory
     add_custom_command(
-      TARGET ${TARGET_NAME} PRE_BUILD
+      TARGET ${TARGET_NAME} POST_BUILD
       COMMAND "${CMAKE_COMMAND}" -E remove_directory $<TARGET_FILE_DIR:${TARGET_NAME}>/${_DESTINATION}
     )
 
     # copy the directory
     add_custom_command(
-      TARGET ${TARGET_NAME} PRE_BUILD 
+      TARGET ${TARGET_NAME} POST_BUILD 
       COMMAND ${CMAKE_COMMAND} -E copy_directory ${_DIRECTORY} 
         $<TARGET_FILE_DIR:${TARGET_NAME}>/${_DESTINATION}
     )
diff --git a/domain-server/CMakeLists.txt b/domain-server/CMakeLists.txt
index 0595144e93..41f2d15486 100644
--- a/domain-server/CMakeLists.txt
+++ b/domain-server/CMakeLists.txt
@@ -1,7 +1,7 @@
 set(TARGET_NAME domain-server)
 
 if (UPPER_CMAKE_BUILD_TYPE MATCHES DEBUG AND NOT WIN32)
-  set(_SHOULD_SYMLINK_RESOURCES FALSE)
+  set(_SHOULD_SYMLINK_RESOURCES TRUE)
 else ()
   set(_SHOULD_SYMLINK_RESOURCES FALSE)
 endif ()
@@ -9,7 +9,9 @@ endif ()
 # setup the project and link required Qt modules
 setup_hifi_project(Network)
 
-
+# TODO: find a solution that will handle web file changes in resources on windows without a re-build.
+# Currently the resources are only copied on post-build. If one is changed but the domain-server is not, they will
+# not be re-copied. This is worked-around on OS X/UNIX by using a symlink.
 symlink_or_copy_directory_beside_target(${_SHOULD_SYMLINK_RESOURCES} "${CMAKE_CURRENT_SOURCE_DIR}/resources" "resources")
 
 # link the shared hifi libraries
diff --git a/domain-server/resources/describe-settings.json b/domain-server/resources/describe-settings.json
index e694afa1da..10a8a21698 100644
--- a/domain-server/resources/describe-settings.json
+++ b/domain-server/resources/describe-settings.json
@@ -486,5 +486,20 @@
         "advanced": true
       }
     ]
+  },
+  {
+    "name": "avatar_mixer",
+    "label": "Avatar Mixer",
+    "assignment-types": [1],
+    "settings": [
+      {
+        "name": "node_bandwidth",
+        "label": "Per-Node Bandwidth",
+        "help": "Desired maximum send bandwidth (in Megabits per second) to each node",
+        "placeholder": "1.0",
+        "default": "1.0",
+        "advanced": true
+      }
+    ]
   }
 ]
diff --git a/libraries/networking/src/JSONBreakableMarshal.cpp b/libraries/networking/src/JSONBreakableMarshal.cpp
index 6d4b66c9d9..866f06acdf 100644
--- a/libraries/networking/src/JSONBreakableMarshal.cpp
+++ b/libraries/networking/src/JSONBreakableMarshal.cpp
@@ -154,7 +154,7 @@ QVariantMap JSONBreakableMarshal::fromStringList(const QStringList& stringList)
             QString keypath = marshalString.left(equalityIndex);
 
             // setup for array index checking
-            const QString ARRAY_INDEX_REGEX_STRING = "\[\\d+\\]";
+            const QString ARRAY_INDEX_REGEX_STRING = "^[\\d+]";
             QRegExp arrayRegex(ARRAY_INDEX_REGEX_STRING);
  
             // as long as we have a keypath we need to recurse downwards