Fixes for code review of client-side node connection implementation