Thanks a lot for your help on this, I have been a bad contributor and busy with other things and failed to follow up. Hopefully I will have a chance to help out with the other issues with these PRs.