Make BuildCheckpoints work