Fix the issues I have just created.