- Small fixes for working on newer versions of node