Final fixes?