Various tweaks for stacktraces