Some submission tweaks