Correct default addresses