Final fixes today