diff --git a/src/applications/project/controller/PhabricatorProjectBoardImportController.php b/src/applications/project/controller/PhabricatorProjectBoardImportController.php
index 8df4e8b810..988084d3ee 100644
--- a/src/applications/project/controller/PhabricatorProjectBoardImportController.php
+++ b/src/applications/project/controller/PhabricatorProjectBoardImportController.php
@@ -1,84 +1,88 @@
 <?php
 
 final class PhabricatorProjectBoardImportController
   extends PhabricatorProjectBoardController {
 
   public function handleRequest(AphrontRequest $request) {
     $viewer = $request->getViewer();
     $project_id = $request->getURIData('projectID');
 
     $project = id(new PhabricatorProjectQuery())
       ->setViewer($viewer)
       ->requireCapabilities(
         array(
           PhabricatorPolicyCapability::CAN_VIEW,
           PhabricatorPolicyCapability::CAN_EDIT,
         ))
       ->withIDs(array($project_id))
       ->executeOne();
     if (!$project) {
       return new Aphront404Response();
     }
     $this->setProject($project);
 
     $columns = id(new PhabricatorProjectColumnQuery())
       ->setViewer($viewer)
       ->withProjectPHIDs(array($project->getPHID()))
       ->execute();
     if ($columns) {
       return new Aphront400Response();
     }
 
     $project_id = $project->getID();
     $board_uri = $this->getApplicationURI("board/{$project_id}/");
 
     if ($request->isFormPost()) {
       $import_phid = $request->getArr('importProjectPHID');
       $import_phid = reset($import_phid);
 
       $import_columns = id(new PhabricatorProjectColumnQuery())
         ->setViewer($viewer)
         ->withProjectPHIDs(array($import_phid))
         ->execute();
       if (!$import_columns) {
         return new Aphront400Response();
       }
 
       $table = id(new PhabricatorProjectColumn())
         ->openTransaction();
       foreach ($import_columns as $import_column) {
         if ($import_column->isHidden()) {
           continue;
         }
+        if ($import_column->getProxy()) {
+          continue;
+        }
+
         $new_column = PhabricatorProjectColumn::initializeNewColumn($viewer)
           ->setSequence($import_column->getSequence())
           ->setProjectPHID($project->getPHID())
           ->setName($import_column->getName())
           ->setProperties($import_column->getProperties())
           ->save();
       }
 
       $project->setHasWorkboard(1)->save();
 
       $table->saveTransaction();
 
       return id(new AphrontRedirectResponse())->setURI($board_uri);
     }
 
     $proj_selector = id(new AphrontFormTokenizerControl())
       ->setName('importProjectPHID')
       ->setUser($viewer)
       ->setDatasource(id(new PhabricatorProjectDatasource())
         ->setParameters(array('mustHaveColumns' => true))
       ->setLimit(1));
 
     return $this->newDialog()
       ->setTitle(pht('Import Columns'))
       ->setWidth(AphrontDialogView::WIDTH_FORM)
       ->appendParagraph(pht('Choose a project to import columns from:'))
       ->appendChild($proj_selector)
       ->addCancelButton($board_uri)
       ->addSubmitButton(pht('Import'));
   }
 
 }
diff --git a/src/applications/project/controller/PhabricatorProjectColumnHideController.php b/src/applications/project/controller/PhabricatorProjectColumnHideController.php
index 41665ea6f8..27dbb17c47 100644
--- a/src/applications/project/controller/PhabricatorProjectColumnHideController.php
+++ b/src/applications/project/controller/PhabricatorProjectColumnHideController.php
@@ -1,145 +1,146 @@
 <?php
 
 final class PhabricatorProjectColumnHideController
   extends PhabricatorProjectBoardController {
 
   public function handleRequest(AphrontRequest $request) {
     $viewer = $request->getViewer();
     $id = $request->getURIData('id');
     $project_id = $request->getURIData('projectID');
 
     $project = id(new PhabricatorProjectQuery())
       ->setViewer($viewer)
       ->requireCapabilities(
         array(
           PhabricatorPolicyCapability::CAN_VIEW,
           PhabricatorPolicyCapability::CAN_EDIT,
         ))
       ->withIDs(array($project_id))
       ->executeOne();
 
     if (!$project) {
       return new Aphront404Response();
     }
     $this->setProject($project);
 
     $column = id(new PhabricatorProjectColumnQuery())
       ->setViewer($viewer)
       ->withIDs(array($id))
       ->requireCapabilities(
         array(
           PhabricatorPolicyCapability::CAN_VIEW,
           PhabricatorPolicyCapability::CAN_EDIT,
         ))
       ->executeOne();
     if (!$column) {
       return new Aphront404Response();
     }
 
     $column_phid = $column->getPHID();
 
     $view_uri = $this->getApplicationURI('/board/'.$project_id.'/');
     $view_uri = new PhutilURI($view_uri);
     foreach ($request->getPassthroughRequestData() as $key => $value) {
       $view_uri->setQueryParam($key, $value);
     }
 
     if ($column->isDefaultColumn()) {
       return $this->newDialog()
         ->setTitle(pht('Can Not Hide Default Column'))
         ->appendParagraph(
           pht('You can not hide the default/backlog column on a board.'))
         ->addCancelButton($view_uri, pht('Okay'));
     }
 
     $proxy = $column->getProxy();
 
     if ($request->isFormPost()) {
       if ($proxy) {
         if ($proxy->isArchived()) {
           $new_status = PhabricatorProjectStatus::STATUS_ACTIVE;
         } else {
           $new_status = PhabricatorProjectStatus::STATUS_ARCHIVED;
         }
 
         $xactions = array();
 
         $xactions[] = id(new PhabricatorProjectTransaction())
           ->setTransactionType(PhabricatorProjectTransaction::TYPE_STATUS)
           ->setNewValue($new_status);
 
         id(new PhabricatorProjectTransactionEditor())
           ->setActor($viewer)
           ->setContentSourceFromRequest($request)
           ->setContinueOnNoEffect(true)
           ->setContinueOnMissingFields(true)
           ->applyTransactions($proxy, $xactions);
       } else {
         if ($column->isHidden()) {
           $new_status = PhabricatorProjectColumn::STATUS_ACTIVE;
         } else {
           $new_status = PhabricatorProjectColumn::STATUS_HIDDEN;
         }
 
         $type_status = PhabricatorProjectColumnTransaction::TYPE_STATUS;
         $xactions = array(
           id(new PhabricatorProjectColumnTransaction())
             ->setTransactionType($type_status)
             ->setNewValue($new_status),
         );
 
         $editor = id(new PhabricatorProjectColumnTransactionEditor())
           ->setActor($viewer)
           ->setContinueOnNoEffect(true)
+          ->setContinueOnMissingFields(true)
           ->setContentSourceFromRequest($request)
           ->applyTransactions($column, $xactions);
       }
 
       return id(new AphrontRedirectResponse())->setURI($view_uri);
     }
 
     if ($proxy) {
       if ($column->isHidden()) {
         $title = pht('Activate and Show Column');
         $body = pht(
           'This column is hidden because it represents an archived '.
           'subproject. Do you want to activate the subproject so the '.
           'column is visible again?');
         $button = pht('Activate Subproject');
       } else {
         $title = pht('Archive and Hide Column');
         $body = pht(
           'This column is visible because it represents an active '.
           'subproject. Do you want to hide the column by archiving the '.
           'subproject?');
         $button = pht('Archive Subproject');
       }
     } else {
       if ($column->isHidden()) {
         $title = pht('Show Column');
         $body = pht('Are you sure you want to show this column?');
         $button = pht('Show Column');
       } else {
         $title = pht('Hide Column');
         $body = pht(
           'Are you sure you want to hide this column? It will no longer '.
           'appear on the workboard.');
         $button = pht('Hide Column');
       }
     }
 
     $dialog = $this->newDialog()
       ->setWidth(AphrontDialogView::WIDTH_FORM)
       ->setTitle($title)
       ->appendChild($body)
       ->setDisableWorkflowOnCancel(true)
       ->addCancelButton($view_uri)
       ->addSubmitButton($button);
 
     foreach ($request->getPassthroughRequestData() as $key => $value) {
       $dialog->addHiddenInput($key, $value);
     }
 
     return $dialog;
   }
 }