Fixes according to feedback for resubmission.