Fixes to address manipulation