Minor tweaks for jar loading