Changes required for safe txi2p use