stefanv/tracshell-fixes

Name: tracshell-fixes