Sure, though it's a little out-of-scope for this PR. Let's get these fixes in, and then that can be a separate change.