Two pagination fixes.