More checkpoint changes