Fix broken last-minute changes