Fix address issues