Fixes tool/tracker.py and tool/main.py