Various fixes and updates to solr setup code