Fix setup after mysterious breakages