Fixes for i2p