BugFixes done in NodeJS