Some final Solr changes