Try to make the address spaces more correct.