Apache-Tika server mode + minor changes