Pull request for things useful in rare cases

These'll be useful. Sometimes. Rarely.
Fixes #807