diff --git a/src/applications/paste/query/PhabricatorPasteSearchEngine.php b/src/applications/paste/query/PhabricatorPasteSearchEngine.php
index 2d69d441fa..91e8a6497e 100644
--- a/src/applications/paste/query/PhabricatorPasteSearchEngine.php
+++ b/src/applications/paste/query/PhabricatorPasteSearchEngine.php
@@ -1,157 +1,157 @@
 <?php
 
 final class PhabricatorPasteSearchEngine
   extends PhabricatorApplicationSearchEngine {
 
   public function getResultTypeDescription() {
     return pht('Pastes');
   }
 
   public function getApplicationClassName() {
     return 'PhabricatorPasteApplication';
   }
 
   public function newResultObject() {
     return new PhabricatorPaste();
   }
 
-  public function buildQueryFromParameters(array $map) {
+  protected function buildQueryFromParameters(array $map) {
     $query = id(new PhabricatorPasteQuery())
       ->needContent(true);
 
     if ($map['authorPHIDs']) {
       $query->withAuthorPHIDs($map['authorPHIDs']);
     }
 
     if ($map['languages']) {
       $query->withLanguages($map['languages']);
     }
 
     if ($map['createdStart']) {
       $query->withDateCreatedAfter($map['createdStart']);
     }
 
     if ($map['createdEnd']) {
       $query->withDateCreatedBefore($map['createdEnd']);
     }
 
     return $query;
   }
 
   protected function buildCustomSearchFields() {
     return array(
       id(new PhabricatorSearchUsersField())
         ->setAliases(array('authors'))
         ->setKey('authorPHIDs')
         ->setLabel(pht('Authors')),
       id(new PhabricatorSearchStringListField())
         ->setKey('languages')
         ->setLabel(pht('Languages')),
       id(new PhabricatorSearchDateField())
         ->setKey('createdStart')
         ->setLabel(pht('Created After')),
       id(new PhabricatorSearchDateField())
         ->setKey('createdEnd')
         ->setLabel(pht('Created Before')),
     );
   }
 
   protected function getURI($path) {
     return '/paste/'.$path;
   }
 
   protected function getBuiltinQueryNames() {
     $names = array(
       'all' => pht('All Pastes'),
     );
 
     if ($this->requireViewer()->isLoggedIn()) {
       $names['authored'] = pht('Authored');
     }
 
     return $names;
   }
 
   public function buildSavedQueryFromBuiltin($query_key) {
 
     $query = $this->newSavedQuery();
     $query->setQueryKey($query_key);
 
     switch ($query_key) {
       case 'all':
         return $query;
       case 'authored':
         return $query->setParameter(
           'authorPHIDs',
           array($this->requireViewer()->getPHID()));
     }
 
     return parent::buildSavedQueryFromBuiltin($query_key);
   }
 
   protected function getRequiredHandlePHIDsForResultList(
     array $pastes,
     PhabricatorSavedQuery $query) {
     return mpull($pastes, 'getAuthorPHID');
   }
 
   protected function renderResultList(
     array $pastes,
     PhabricatorSavedQuery $query,
     array $handles) {
     assert_instances_of($pastes, 'PhabricatorPaste');
 
     $viewer = $this->requireViewer();
 
     $lang_map = PhabricatorEnv::getEnvConfig('pygments.dropdown-choices');
 
     $list = new PHUIObjectItemListView();
     $list->setUser($viewer);
     foreach ($pastes as $paste) {
       $created = phabricator_date($paste->getDateCreated(), $viewer);
       $author = $handles[$paste->getAuthorPHID()]->renderLink();
 
       $lines = phutil_split_lines($paste->getContent());
 
       $preview = id(new PhabricatorSourceCodeView())
         ->setLimit(5)
         ->setLines($lines)
         ->setURI(new PhutilURI($paste->getURI()));
 
       $source_code = phutil_tag(
         'div',
         array(
           'class' => 'phabricator-source-code-summary',
         ),
         $preview);
 
       $created = phabricator_datetime($paste->getDateCreated(), $viewer);
       $line_count = count($lines);
       $line_count = pht(
         '%s Line(s)',
         new PhutilNumber($line_count));
 
       $title = nonempty($paste->getTitle(), pht('(An Untitled Masterwork)'));
 
       $item = id(new PHUIObjectItemView())
         ->setObjectName('P'.$paste->getID())
         ->setHeader($title)
         ->setHref('/P'.$paste->getID())
         ->setObject($paste)
         ->addByline(pht('Author: %s', $author))
         ->addIcon('none', $created)
         ->addIcon('none', $line_count)
         ->appendChild($source_code);
 
       $lang_name = $paste->getLanguage();
       if ($lang_name) {
         $lang_name = idx($lang_map, $lang_name, $lang_name);
         $item->addIcon('none', $lang_name);
       }
 
       $list->addItem($item);
     }
 
     return $list;
   }
 }
diff --git a/src/applications/spaces/view/PhabricatorSpacesControl.php b/src/applications/spaces/view/PhabricatorSpacesControl.php
index 659de58b1a..aa40238c56 100644
--- a/src/applications/spaces/view/PhabricatorSpacesControl.php
+++ b/src/applications/spaces/view/PhabricatorSpacesControl.php
@@ -1,49 +1,49 @@
 <?php
 
 final class PhabricatorSpacesControl extends AphrontFormControl {
 
   private $object;
 
   protected function shouldRender() {
     // Render this control only if some Spaces exist.
     return PhabricatorSpacesNamespaceQuery::getAllSpaces();
   }
 
   public function setObject(PhabricatorSpacesInterface $object) {
     $this->object = $object;
     return $this;
   }
 
   protected function getCustomControlClass() {
     return '';
   }
 
   protected function getOptions() {
     $viewer = $this->getUser();
     $viewer_spaces = PhabricatorSpacesNamespaceQuery::getViewerSpaces($viewer);
 
     $map = mpull($viewer_spaces, 'getNamespaceName', 'getPHID');
     asort($map);
 
     return $map;
   }
 
-  public function renderInput() {
+  protected function renderInput() {
     $viewer = $this->getUser();
 
     $this->setLabel(pht('Space'));
 
     $value = $this->getValue();
     if ($value === null) {
       $value = $viewer->getDefaultSpacePHID();
     }
 
     return AphrontFormSelectControl::renderSelectTag(
       $value,
       $this->getOptions(),
       array(
         'name' => $this->getName(),
       ));
   }
 
 }