Fix dependency tree

Due to improper scope on a few artifacts, shading HikariCP into another project included a lot of other transitive dependencies. I've also fixed some other minor issues.