Fixes for resubmission