diff --git a/search-services/alfresco-solrclient-lib/source/java/org/alfresco/solr/InformationServer.java b/search-services/alfresco-solrclient-lib/source/java/org/alfresco/solr/InformationServer.java
index b4e70cfda..8975a0c34 100644
--- a/search-services/alfresco-solrclient-lib/source/java/org/alfresco/solr/InformationServer.java
+++ b/search-services/alfresco-solrclient-lib/source/java/org/alfresco/solr/InformationServer.java
@@ -36,7 +36,7 @@ import org.alfresco.solr.client.AlfrescoModel;
 import org.alfresco.solr.client.Node;
 import org.alfresco.solr.client.Transaction;
 import org.alfresco.solr.tracker.IndexHealthReport;
-import org.alfresco.solr.tracker.Tracker;
+import org.alfresco.solr.tracker.TrackerStats;
 import org.json.JSONException;
 
 /**
@@ -85,7 +85,7 @@ public interface InformationServer
 
     Iterable<Map.Entry<String, Object>> getCoreStats() throws IOException;
 
-    Tracker getTracker();
+    TrackerStats getTrackerStats();
 
     Map<String, Set<String>> getModelErrors();
 
diff --git a/search-services/alfresco-solrclient-lib/source/java/org/alfresco/solr/TrackerState.java b/search-services/alfresco-solrclient-lib/source/java/org/alfresco/solr/TrackerState.java
index 06d7f6c61..90a62da18 100644
--- a/search-services/alfresco-solrclient-lib/source/java/org/alfresco/solr/TrackerState.java
+++ b/search-services/alfresco-solrclient-lib/source/java/org/alfresco/solr/TrackerState.java
@@ -21,6 +21,7 @@ package org.alfresco.solr;
 
 /**
  * This class was moved from org.alfresco.solr.tracker.CoreTracker 
+ * The data in this class is relevant for a particular Solr index.
  */
 public class TrackerState
 {
diff --git a/search-services/alfresco-solrclient-lib/source/java/org/alfresco/solr/adapters/IOpenBitSet.java b/search-services/alfresco-solrclient-lib/source/java/org/alfresco/solr/adapters/IOpenBitSet.java
index 9fa671972..9dc284704 100644
--- a/search-services/alfresco-solrclient-lib/source/java/org/alfresco/solr/adapters/IOpenBitSet.java
+++ b/search-services/alfresco-solrclient-lib/source/java/org/alfresco/solr/adapters/IOpenBitSet.java
@@ -1,6 +1,29 @@
+/*
+ * Copyright (C) 2014 Alfresco Software Limited.
+ *
+ * This file is part of Alfresco
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ */
 
 package org.alfresco.solr.adapters;
 
+/**
+ * The reason we have this interface is so that lucene-free dependent classes can be dependent on IOpenBitSet instead of the
+ * lucene-version-specific OpenBitSet.
+ * @author Ahmed Owian
+ */
 public interface IOpenBitSet
 {