Fix from-addresses