Tiny Insignificant Update

I'm committing this to get the few changes I made across before merging
everything else I need into my branch.