A few little fixes

should I wait for your change or will you do another pull request ?