More address space tweaks.