I've fixed those in a different pull request.