More ip-agnostic fixes.