Several checkpoint recovery improvements