more hikaricp fixes