Bug fixes in multiple pages