This was meant to be present before the first patch.
I'll move the fixes to the first patch when I apply/resubmit.

Patch attached.