This fix works, but a couple of general things:
1. It's generally a good idea to submit different fixes in different pull requests. This makes it a lot easier to review things. (It isn't as much of an issue here because these are short fixes, but later it will be important).
2. I see that you were doing these fixes in your master branch. It will be a lot easier later to use separate branches (which also allows you to submit multiple pull requests).  We can discuss git workflow the next time we meet.