Import a few traceR-bugfixes