Fixes for Hsqldb and H2 integration tests