Fix page number and damage saving errors