Another fixes of pdoPage