Checkpoint & fixes