Recent fixes targeted at 0.10.x

[Noah Slater]

I noticed some UUID fixes and an etap change targeted at 0.10.x.

Should we recall the vote for these?