Fix issues with JARs