Small fixes.

In order for this library to work on newest node.js version.
Not yet complete.