Exchanges: fixed more bugs from last round.