Mini Rollup

Trying to get a couple of these into the next snapshot.