Fixed some issues with node module