diff --git a/app/static/js/CorpusAnalysis/QueryBuilder.js b/app/static/js/CorpusAnalysis/QueryBuilder.js
index c35e9e90..a1130c65 100644
--- a/app/static/js/CorpusAnalysis/QueryBuilder.js
+++ b/app/static/js/CorpusAnalysis/QueryBuilder.js
@@ -561,7 +561,6 @@ class ConcordanceQueryBuilder {
       if (tokenIsEmpty === false) {
         tokenQueryText = '[' + tokenQueryText + ']';
         }
-      console.log(tokenQueryText);
       this.queryChipFactory('token', tokenQueryContent, tokenQueryText);
       this.hideEverything();
       this.elements.positionalAttrArea.classList.add('hide');
diff --git a/app/static/js/ResourceLists/CorpusFollowerList.js b/app/static/js/ResourceLists/CorpusFollowerList.js
index 1d0b4877..585c3633 100644
--- a/app/static/js/ResourceLists/CorpusFollowerList.js
+++ b/app/static/js/ResourceLists/CorpusFollowerList.js
@@ -113,7 +113,6 @@ class CorpusFollowerList extends ResourceList {
   }
 
   onChange(event) {
-    console.log(event.target.tagName);
     let listItemElement = event.target.closest('.list-item[data-id]');
     if (listItemElement === null) {return;}
     let itemId = listItemElement.dataset.id;
diff --git a/app/templates/corpora/_corpus/action_buttons.html.j2 b/app/templates/corpora/_corpus/action_buttons.html.j2
index 1620d177..30afbbaf 100644
--- a/app/templates/corpora/_corpus/action_buttons.html.j2
+++ b/app/templates/corpora/_corpus/action_buttons.html.j2
@@ -22,11 +22,13 @@
       <a class="action-button btn waves-effect waves-light disabled" id="build-button" style="width: 100%;"><i class="nopaque-icons left">K</i>Build</a>
       {% endif %}
     </div>
-    {% if corpus.status.name in ['BUILT', 'STARTING_ANALYSIS_SESSION', 'RUNNING_ANALYSIS_SESSION', 'CANCELING_ANALYSIS_SESSION'] %}
     <div class="col s12 l6" style="padding: 0 2.5px;">
+      {% if corpus.status.name in ['BUILT', 'STARTING_ANALYSIS_SESSION', 'RUNNING_ANALYSIS_SESSION', 'CANCELING_ANALYSIS_SESSION'] %}
       <a class="btn waves-effect waves-light" href="{{ url_for('corpora.analysis', corpus_id=corpus.id) }}" style="width: 100%;"><i class="material-icons left">search</i>Analyze</a>
+      {% else %}
+      <a class="btn waves-effect waves-light disabled" href="{{ url_for('corpora.analysis', corpus_id=corpus.id) }}" style="width: 100%;"><i class="material-icons left">search</i>Analyze</a>
+      {% endif %}
     </div>
-    {% endif %}
   {% endif %}
   {% if current_user.is_following_corpus(corpus) %}
   <div class="col s12 l6" style="padding: 5px 2.5px 0 2.5px;">
diff --git a/app/templates/corpora/corpus.html.j2 b/app/templates/corpora/corpus.html.j2
index 02d4245d..7fce4da4 100644
--- a/app/templates/corpora/corpus.html.j2
+++ b/app/templates/corpora/corpus.html.j2
@@ -89,7 +89,7 @@
       <div class="card">
         <div class="card-content">
           <span class="card-title" id="files">Corpus files</span>
-          <div class="corpus-file-list" id="corpus-file-list" data-has-permission-view="{{ cfr.has_permission('VIEW')|tojson }}" data-has-permission-manage-files="{{ cfr.has_permission('MANAGE_FILES')|tojson }}" data-corpus-id="{{ corpus.hashid }}"></div>
+          <div class="corpus-file-list" data-has-permission-view="{{ cfr.has_permission('VIEW')|tojson }}" data-has-permission-manage-files="{{ cfr.has_permission('MANAGE_FILES')|tojson }}" data-corpus-id="{{ corpus.hashid }}" data-user-id="{{ corpus.user.hashid }}"></div>
         </div>
         {% if cfr.has_permission('MANAGE_FILES') %}
         <div class="card-action right-align">
@@ -240,14 +240,14 @@
 let corpusDisplay = new CorpusDisplay(document.querySelector('#corpus-display'));
 {% endif %}
 
-let corpusFileList = new CorpusFileList(document.querySelector('#corpus-file-list'));
+{# let corpusFileList = new CorpusFileList(document.querySelector('#corpus-file-list'));
 corpusFileList.add(
   [
     {% for corpus_file in corpus.files %}
     {{ corpus_file.to_json_serializeable()|tojson }},
     {% endfor %}
   ]
-);
+); #}
 
 {% if current_user.is_following_corpus(corpus) %}
   {% if cfr.has_permission('MANAGE_FILES') %}