Fixed up remaining paginator issues.