small fixes related to address import