fix E/Trace errors