Final fixes?!