Thanks, I've pushed these 3 patches to master as
fbcc42ad6c22ef7257daede968ff2b8d41bdd30d.

Chris