Fixes in Lucene