Fixed some bugs in Paginator