Tweaked default IdGenerator implementation / address utils