More pagination tweaks