Modern will_paginate fixes