Fixed an issue with Stack Trace data
Minor changes