Fixing JAR issues