Fix credits; Fix checkpoints;