change some address guards to uint32