Fix traces related operations