dataplug: fixes