Also, minor adjustments elsewhere Referencing: - monero-project/kovri#256 - monero-project/monero-site#155