Wrap up Tika for the moment
A few more Tika tweaks