I added a new commit correcting these issues.
Thanks!