Fix Tool Chain Persistence