Are the two fixes in this file issues in the original pub source as well? If so, can you look at upstreaming them?