Minor adress changes