More fixes to existing pages