More fixes for specific pages