More pagination tweaks.