Checkpoint fixes