Added checkpoints and post-fork tweaks