Small fixes and Node server update