Fixes to pagination on some pages