Fixes and paginator