Added multiple changes in an attempt to get the integrated JavaDB working.