Do not create nodes other than via bootstrap
Fix problems with export of new nodes