Fixes to some pages