Fix tool chain to work better with dashboard