diff --git a/scripts/mail/mail_handler.php b/scripts/mail/mail_handler.php
index b76b3910df..1c3c71f305 100755
--- a/scripts/mail/mail_handler.php
+++ b/scripts/mail/mail_handler.php
@@ -38,15 +38,19 @@ $parser->setText(file_get_contents('php://stdin'));
 $content = array();
 foreach (array('text', 'html') as $part) {
   $part_body = $parser->getMessageBody($part);
-  $part_headers = $parser->getMessageBodyHeaders($part);
-  $content_type = idx($part_headers, 'content-type');
-  if (
-    !phutil_is_utf8($part_body) &&
-    (preg_match('/charset="(.*?)"/', $content_type, $matches) ||
-     preg_match('/charset=(\S+)/', $content_type, $matches))
-  ) {
-    $part_body = phutil_utf8_convert($part_body, 'UTF-8', $matches[1]);
+
+  if (strlen($part_body) && !phutil_is_utf8($part_body)) {
+    $part_headers = $parser->getMessageBodyHeaders($part);
+    if (!is_array($part_headers)) {
+      $part_headers = array();
+    }
+    $content_type = idx($part_headers, 'content-type');
+    if (preg_match('/charset="(.*?)"/', $content_type, $matches) ||
+        preg_match('/charset=(\S+)/', $content_type, $matches)) {
+      $part_body = phutil_utf8_convert($part_body, 'UTF-8', $matches[1]);
+    }
   }
+
   $content[$part] = $part_body;
 }
 
diff --git a/src/applications/diffusion/view/DiffusionPatternSearchView.php b/src/applications/diffusion/view/DiffusionPatternSearchView.php
index a679b51400..93ef42d46d 100644
--- a/src/applications/diffusion/view/DiffusionPatternSearchView.php
+++ b/src/applications/diffusion/view/DiffusionPatternSearchView.php
@@ -96,10 +96,11 @@ final class DiffusionPatternSearchView extends DiffusionView {
 
     $path_title = Filesystem::readablePath($this->path, $drequest->getPath());
 
-    $href = $drequest->generateURI(array(
-      'action' => 'browse',
-      'path' => $path_title,
-    ));
+    $href = $drequest->generateURI(
+      array(
+        'action' => 'browse',
+        'path' => $this->path,
+      ));
 
     $title = phutil_tag('a', array('href' => $href), $path_title);
 
diff --git a/src/applications/maniphest/conduit/ManiphestGetTaskTransactionsConduitAPIMethod.php b/src/applications/maniphest/conduit/ManiphestGetTaskTransactionsConduitAPIMethod.php
index 8b0d0496cf..357d118bc4 100644
--- a/src/applications/maniphest/conduit/ManiphestGetTaskTransactionsConduitAPIMethod.php
+++ b/src/applications/maniphest/conduit/ManiphestGetTaskTransactionsConduitAPIMethod.php
@@ -21,6 +21,16 @@ final class ManiphestGetTaskTransactionsConduitAPIMethod
     return 'nonempty list<dict<string, wild>>';
   }
 
+  public function getMethodStatus() {
+    return self::METHOD_STATUS_FROZEN;
+  }
+
+  public function getMethodStatusDescription() {
+    return pht(
+      'This method is frozen and will eventually be deprecated. New code '.
+      'should use "transaction.search" instead.');
+  }
+
   protected function execute(ConduitAPIRequest $request) {
     $results = array();
     $task_ids = $request->getValue('ids');
diff --git a/src/applications/maniphest/xaction/ManiphestTaskPriorityTransaction.php b/src/applications/maniphest/xaction/ManiphestTaskPriorityTransaction.php
index 2ed7c4e15b..83f38fc659 100644
--- a/src/applications/maniphest/xaction/ManiphestTaskPriorityTransaction.php
+++ b/src/applications/maniphest/xaction/ManiphestTaskPriorityTransaction.php
@@ -6,20 +6,17 @@ final class ManiphestTaskPriorityTransaction
   const TRANSACTIONTYPE = 'priority';
 
   public function generateOldValue($object) {
-    if ($this->isNewObject()) {
-      return null;
-    }
-    return $object->getPriority();
+    return (string)$object->getPriority();
   }
 
   public function generateNewValue($object, $value) {
     // `$value` is supposed to be a keyword, but if the priority
     // assigned to a task has been removed from the config,
     // no such keyword will be available. Other edits to the task
-    // should still be allowed, even if the priority is  no longer
+    // should still be allowed, even if the priority is no longer
     // valid, so treat this as a no-op.
     if ($value === ManiphestTaskPriority::UNKNOWN_PRIORITY_KEYWORD) {
-      return $object->getPriority();
+      return (string)$object->getPriority();
     }
 
     return (string)ManiphestTaskPriority::getTaskPriorityFromKeyword($value);
diff --git a/src/applications/maniphest/xaction/ManiphestTaskStatusTransaction.php b/src/applications/maniphest/xaction/ManiphestTaskStatusTransaction.php
index a3780e81b9..dd51a63799 100644
--- a/src/applications/maniphest/xaction/ManiphestTaskStatusTransaction.php
+++ b/src/applications/maniphest/xaction/ManiphestTaskStatusTransaction.php
@@ -6,9 +6,6 @@ final class ManiphestTaskStatusTransaction
   const TRANSACTIONTYPE = 'status';
 
   public function generateOldValue($object) {
-    if ($this->isNewObject()) {
-      return null;
-    }
     return $object->getStatus();
   }