Fixed breakages