Checkpoint before pulling first-order
Remove warnings