Fix breakages.