Additional pagination fixes