Fix deprecation warnings caused by changes in core's Paginator