Fixed the crazy bug only showing up without address randomization (thanks to Fabrice).  Other changes, comparatively minor