Minor tweaking to make jar size stay below 200k