Fixes for Solr bug