some core changes needed for pages