Fixes for NodeJS Client