Node script fixes