Fixed some dependencies, so .jar would work better