Fixes to run with the Oracle Text and in UTF-8