Tweaks in preparation for packaging as jar