If you can be bothered (and it'll speed things up on our end) if you can pick commits from their repo that fix this and apply them here that would be great.