Fixes to facilitate node client