diff --git a/astrid/.classpath b/astrid/.classpath
index 20e839511..ae9dcdc83 100644
--- a/astrid/.classpath
+++ b/astrid/.classpath
@@ -32,5 +32,6 @@
 	<classpathentry kind="lib" path="libs/findbugs-annotations.jar"/>
 	<classpathentry kind="lib" path="libs/CWAC-SackOfViewsAdapter.jar"/>
 	<classpathentry kind="lib" path="libs/gcm.jar" sourcepath="libs/gcm-src.jar"/>
+	<classpathentry kind="lib" path="libs/commons-lang3-3.1.jar" sourcepath="libs/commons-lang3-3.1-sources.jar"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>
diff --git a/astrid/libs/commons-lang3-3.1-sources.jar b/astrid/libs/commons-lang3-3.1-sources.jar
new file mode 100644
index 000000000..02cd2f254
Binary files /dev/null and b/astrid/libs/commons-lang3-3.1-sources.jar differ
diff --git a/astrid/libs/commons-lang3-3.1.jar b/astrid/libs/commons-lang3-3.1.jar
new file mode 100644
index 000000000..a85e539b1
Binary files /dev/null and b/astrid/libs/commons-lang3-3.1.jar differ
diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/MakeChanges.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/MakeChanges.java
index 28af46abe..f6b12963a 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/MakeChanges.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/MakeChanges.java
@@ -20,7 +20,6 @@ import com.todoroo.astrid.actfm.sync.ActFmPreferenceService;
 import com.todoroo.astrid.dao.RemoteModelDao;
 import com.todoroo.astrid.data.RemoteModel;
 import com.todoroo.astrid.data.SyncFlags;
-import com.todoroo.astrid.data.Task;
 
 @SuppressWarnings("nls")
 public class MakeChanges<TYPE extends RemoteModel> extends ServerToClientMessage {
@@ -121,16 +120,7 @@ public class MakeChanges<TYPE extends RemoteModel> extends ServerToClientMessage
 
         @Override
         public void performChanges() {
-            try {
-                if (changes.has("has_due_time")) {
-                    int urgency = changes.getBoolean("has_due_time") ? Task.URGENCY_SPECIFIC_DAY_TIME : Task.URGENCY_SPECIFIC_DAY;
-                    model.setValue(Task.DUE_DATE, Task.createDueDate(urgency, model.getValue(Task.DUE_DATE)));
-                }
-            } catch (JSONException e) {
-                Log.e(ERROR_TAG, "Error processing non-column properties", e);
-            }
-
-
+            // Perform any non-field based changes
         }
     }
 
@@ -171,11 +161,14 @@ public class MakeChanges<TYPE extends RemoteModel> extends ServerToClientMessage
         @Override
         public Void visitLong(Property<Long> property, String key) {
             try {
-                long value = data.getLong(key);
+                long value = data.optLong(key, 0);
                 if (property.checkFlag(Property.PROP_FLAG_USER_ID) && value == ActFmPreferenceService.userId())
                     value = 0;
-                else if (property.checkFlag(Property.PROP_FLAG_DATE))
+                else if (property.checkFlag(Property.PROP_FLAG_DATE)) {
+                    String valueString = data.getString(key);
+                    // Parse string and setup time value
                     value = value * 1000L;
+                }
                 model.setValue((LongProperty) property, value);
             } catch (JSONException e) {
                 Log.e(ERROR_TAG, "Error reading long value with key " + key + " from JSON " + data, e);