Avoid depending on MProf.Trace

Might not be compiled with tracing support.
Added missing dependencies