Thanks! Looks good to me. I can merge this once the above issue has been resolved. You can also separate the two changes in two individual commits if you like to have this merged earlier.