Some minor fixes and preparation for NodeJitsu