Fix Address and Map Savings