Fixed compile errors due to new address spaces