These patches look good to me, I've pushed them to master as
49cd552866f2b18db0c02a8a8768a28935fe6de1.

Thanks,

Chris