WIP commit while Solr is still broken. Bug fixes.