Fixes a few issues in the process of the broken addresses.