Improved rollback on some blocks