Fix rollback errors