Fix breakages