fix some addrssing errors