Fixes regarding order of submit actions