Continued Submission fixes