Small changes before submitting