Mass cleaning address fixes