Trace Message, Minor fixes