Small changes in HSQLDBServer