Same fixes as before.