Final fixes for today