Fix small issues with data pages