Fixed CheckpointFactories