Some cleanup involving invalid addresses