More pagination fixes