Cleanup, solr fixes, etc.