Final fixes for submission