Fix address style in steps 2 & 3