I’ve added a PR fixing 2. Thanks for open sourcing!