Fixes, DI in node, /ht @jergason