More fixes to build and node usage