SOLR-5986: Fixing things