Bringing jpa in line with jdbc version