Fixed up a few minor pagination bugs