Fix same issues as before on different pages.