Address factory fixes