Fix specs, fix paginate