migrated to hsql 2.2.8 and fixed a couple of JPA issues