Some bugfixes for the optional addresses