More work on locations and addresses