Small bug fixes for paginator