Fix the final stuff.