Minfixes for pagetoken