Pulling JAR building fix and other fixes