Fixes realated to previous commit (double siptrace)