more clucene fixes