Minor adjustments before re-submission