Fixes to addressability