bugfixes for prep-node