Bug fixes + lucene 4.1