Updated several missed references to version 3 addresses