More tweaks for fat jar