another --disable-trace compilation fixes, fixes #2460