Add a little fixes on #20