server-node: Bugfixes for last commit