Nice work @AG19

I’ve submitted a PR for the two fixes mentioned in this thread to make the current master branch compile: