Minor fixes and a sketch for Solr index builder.