Page-building fixes