JPackage macro fixes