Fixed issues TRACE-3 to TTRACE-7