Fixup node server and client to prep for uservoice integratoion