Final fixes before submission