Cleanups to tracebacks and other dock refactor improvements