Some fixes for address display