- Fix the OUTGOING stuff (merge from 1.4)