Fix Paginate component & others