More fixes to Tundra