Tweaked address utils