Fix address & street stuff