Propagated the self-forking fix from bottlecaps.
Added 2 checkpoints.