More Jar fixes