> Would you prefer me to look at that too, and see if I can fix that as well in the forked files?

Sounds good to me!