Final fixes for the day