TRESOR-467 modifications after snet improvements