Fix final things