Minor fixes

This commit fixes some minor things that are mentionned
in #3.