Trace+connector+fixes

Trace+connector+fixes