I will add a task to fix these two.