Ported over fixes that I made when working on delta-encoding for avatars.