Tweaks before submission