Minor fixes, sort of preparing for removing the IPs of no-longer-existing contexts.