Lucene fixes