Fix Boundaries for address gen