fix integer overflow in expression
Fix Checkpoints