Fixes realated to previous commit (double siptrace)

(cherry picked from commit d4e81886c41e17fe259ba2ee48d6b2ce3e7eb016)