Some tweaks for street & address