Rollback on DrawArrays inside list, plus some missing commit