Fix outbound messages and filter self