Rollback logic fixes