More commits to make drone happy.

This one does some correct stuff to make sure we're not adding
null-terminated chars to our dumps, in a way that doesn't cause
warnings.