Merge last of bugfixes for 1.0.0-beta.32.16

https://github.com/dalehenrich/metacello-work/issues?q=milestone%3A1.0.0-beta.32.16+is%3Aclosed