Fix some broken logging, make an effort to prevent forwarding loops from causing trouble