More fixes

this are some minor fixes for the tracing support. a 3-stage-bootstrap works flawlessly. ready to merge!