Changes to better support NodeJS.