A few addrspace changes to syntax