Fixup PRSVADDR problem as per Johns suggestions.