Simpler backtrace output
Fix bug that was messing up the callstack