Fixes for submitting