Some fixes on the jar