Adjust to splitbrain data plugin including fix for "bureaucracy's" dataplugin