Fix more address fields f-me/carma#1815