Improve jar loading a bit