Setup fixes